Merge commit 'origin'
authorJohan Dahlin <johan@gnome.org>
Wed, 12 May 2010 22:54:28 +0000 (19:54 -0300)
committerJohan Dahlin <johan@gnome.org>
Wed, 12 May 2010 22:54:28 +0000 (19:54 -0300)

Trivial merge